Improve a warning.

	* gtk/gtkcontainer.c (gtk_container_class_install_child_property):
	Improve a warning.

	* gdk/linux-fb/gdkinput.c (gdk_device_get_axis): Remove a broken
	and redundant doc comment.

	* gtk/gtkprogress.c (gtk_progress_class_init):
	* gtk/gtkprogressbar.c (gtk_progress_bar_class_init):
	* gtk/gtktexttag.c (gtk_text_tag_class_init):
	* gtk/gtknotebook.c (gtk_notebook_class_init): Better blurbs,
	incorporating stuff from the doc templates.

	* gtk/gtkplug.c (gtk_plug_construct): Fix docs.

diff --git a/ChangeLog b/ChangeLog
index 9433f2081b7153b2c0bcc05de1c0daa92eee5d65..e689e1fc53f61c86304b30d2c7a178e606b67da0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2002-05-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
+       Improve a warning.
+
+       * gdk/linux-fb/gdkinput.c (gdk_device_get_axis): Remove a broken
+       and redundant doc comment.
+
+2002-04-30  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkprogress.c (gtk_progress_class_init): 
+       * gtk/gtkprogressbar.c (gtk_progress_bar_class_init): 
+       * gtk/gtktexttag.c (gtk_text_tag_class_init): 
+       * gtk/gtknotebook.c (gtk_notebook_class_init): Better blurbs,
+       incorporating stuff from the doc templates.
+
+       * gtk/gtkplug.c (gtk_plug_construct): Fix docs.
+
 Tue Apr 30 15:59:53 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testmultiscreen.c: Multi-screen test case
@@ -24,6 +42,7 @@ Tue Apr 30 14:15:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes.
 
+>>>>>>> 1.3389
 2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
 
         * gdk/x11/gdkimage-x11.c : rationalized multihead code

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9433f2081b7153b2c0bcc05de1c0daa92eee5d65..e689e1fc53f61c86304b30d2c7a178e606b67da0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,21 @@
+2002-05-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
+       Improve a warning.
+
+       * gdk/linux-fb/gdkinput.c (gdk_device_get_axis): Remove a broken
+       and redundant doc comment.
+
+2002-04-30  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkprogress.c (gtk_progress_class_init): 
+       * gtk/gtkprogressbar.c (gtk_progress_bar_class_init): 
+       * gtk/gtktexttag.c (gtk_text_tag_class_init): 
+       * gtk/gtknotebook.c (gtk_notebook_class_init): Better blurbs,
+       incorporating stuff from the doc templates.
+
+       * gtk/gtkplug.c (gtk_plug_construct): Fix docs.
+
 Tue Apr 30 15:59:53 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testmultiscreen.c: Multi-screen test case
@@ -24,6 +42,7 @@ Tue Apr 30 14:15:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes.
 
+>>>>>>> 1.3389
 2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
 
         * gdk/x11/gdkimage-x11.c : rationalized multihead code

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9433f2081b7153b2c0bcc05de1c0daa92eee5d65..e689e1fc53f61c86304b30d2c7a178e606b67da0 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,21 @@
+2002-05-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
+       Improve a warning.
+
+       * gdk/linux-fb/gdkinput.c (gdk_device_get_axis): Remove a broken
+       and redundant doc comment.
+
+2002-04-30  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkprogress.c (gtk_progress_class_init): 
+       * gtk/gtkprogressbar.c (gtk_progress_bar_class_init): 
+       * gtk/gtktexttag.c (gtk_text_tag_class_init): 
+       * gtk/gtknotebook.c (gtk_notebook_class_init): Better blurbs,
+       incorporating stuff from the doc templates.
+
+       * gtk/gtkplug.c (gtk_plug_construct): Fix docs.
+
 Tue Apr 30 15:59:53 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testmultiscreen.c: Multi-screen test case
@@ -24,6 +42,7 @@ Tue Apr 30 14:15:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes.
 
+>>>>>>> 1.3389
 2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
 
         * gdk/x11/gdkimage-x11.c : rationalized multihead code

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9433f2081b7153b2c0bcc05de1c0daa92eee5d65..e689e1fc53f61c86304b30d2c7a178e606b67da0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,21 @@
+2002-05-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
+       Improve a warning.
+
+       * gdk/linux-fb/gdkinput.c (gdk_device_get_axis): Remove a broken
+       and redundant doc comment.
+
+2002-04-30  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkprogress.c (gtk_progress_class_init): 
+       * gtk/gtkprogressbar.c (gtk_progress_bar_class_init): 
+       * gtk/gtktexttag.c (gtk_text_tag_class_init): 
+       * gtk/gtknotebook.c (gtk_notebook_class_init): Better blurbs,
+       incorporating stuff from the doc templates.
+
+       * gtk/gtkplug.c (gtk_plug_construct): Fix docs.
+
 Tue Apr 30 15:59:53 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testmultiscreen.c: Multi-screen test case
@@ -24,6 +42,7 @@ Tue Apr 30 14:15:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes.
 
+>>>>>>> 1.3389
 2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
 
         * gdk/x11/gdkimage-x11.c : rationalized multihead code

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9433f2081b7153b2c0bcc05de1c0daa92eee5d65..e689e1fc53f61c86304b30d2c7a178e606b67da0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,21 @@
+2002-05-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
+       Improve a warning.
+
+       * gdk/linux-fb/gdkinput.c (gdk_device_get_axis): Remove a broken
+       and redundant doc comment.
+
+2002-04-30  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkprogress.c (gtk_progress_class_init): 
+       * gtk/gtkprogressbar.c (gtk_progress_bar_class_init): 
+       * gtk/gtktexttag.c (gtk_text_tag_class_init): 
+       * gtk/gtknotebook.c (gtk_notebook_class_init): Better blurbs,
+       incorporating stuff from the doc templates.
+
+       * gtk/gtkplug.c (gtk_plug_construct): Fix docs.
+
 Tue Apr 30 15:59:53 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testmultiscreen.c: Multi-screen test case
@@ -24,6 +42,7 @@ Tue Apr 30 14:15:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes.
 
+>>>>>>> 1.3389
 2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
 
         * gdk/x11/gdkimage-x11.c : rationalized multihead code

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9433f2081b7153b2c0bcc05de1c0daa92eee5d65..e689e1fc53f61c86304b30d2c7a178e606b67da0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,21 @@
+2002-05-01  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcontainer.c (gtk_container_class_install_child_property):
+       Improve a warning.
+
+       * gdk/linux-fb/gdkinput.c (gdk_device_get_axis): Remove a broken
+       and redundant doc comment.
+
+2002-04-30  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkprogress.c (gtk_progress_class_init): 
+       * gtk/gtkprogressbar.c (gtk_progress_bar_class_init): 
+       * gtk/gtktexttag.c (gtk_text_tag_class_init): 
+       * gtk/gtknotebook.c (gtk_notebook_class_init): Better blurbs,
+       incorporating stuff from the doc templates.
+
+       * gtk/gtkplug.c (gtk_plug_construct): Fix docs.
+
 Tue Apr 30 15:59:53 2002  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testmultiscreen.c: Multi-screen test case
@@ -24,6 +42,7 @@ Tue Apr 30 14:15:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes.
 
+>>>>>>> 1.3389
 2002-04-30  Erwann Chenede - <erwann.chenede@sun.com>
 
         * gdk/x11/gdkimage-x11.c : rationalized multihead code

diff --git a/gdk/linux-fb/gdkinput.c b/gdk/linux-fb/gdkinput.c
index 48053ddbb1f34049c9df743ef235c7904fe52eaf..ef3a5c896240b40b7b43f924616a953fbf8c4383 100644 (file)
--- a/gdk/linux-fb/gdkinput.c
+++ b/gdk/linux-fb/gdkinput.c
@@ -356,18 +356,6 @@ _gdk_input_exit (void)
   g_list_free (_gdk_input_windows);
 }
 
-/**
- * gdk_device_get_axis:
- * @axis: a #GdkDevice
- * @axes: pointer to an array of axes
- * @use: the use to look for
- * @value: location to store the found value.
- * 
- * Interprets an array of double as axis values for a given device,
- * and locates the value in the array for a given axis use.
- * 
- * Return value: %TRUE if the given axis use was found, otherwies %FALSE
- **/
 gboolean
 gdk_device_get_axis (GdkDevice *device, gdouble *axes, GdkAxisUse use, gdouble *value)
 {

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index b93d9d1ad6408eba6d0db15c581719e3a7295a19..3690a4b02c980bc0c7fef0b561a33d484bcafaca 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -642,7 +642,7 @@ gtk_container_class_install_child_property (GtkContainerClass *class,
 
   if (g_param_spec_pool_lookup (_gtk_widget_child_property_pool, pspec->name, G_OBJECT_CLASS_TYPE (class), FALSE))
     {
-      g_warning (G_STRLOC ": class `%s' already contains a property named `%s'",
+      g_warning (G_STRLOC ": class `%s' already contains a child property named `%s'",
                 G_OBJECT_CLASS_NAME (class),
                 pspec->name);
       return;

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 9e2dab5489c8eee1b5879c625d12a9b01d219cb4..c3dcd575514aa80f4530f98ca8c85a17c8c451cc 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -418,7 +418,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                   PROP_SCROLLABLE,
                                   g_param_spec_boolean ("scrollable",
                                                         _("Scrollable"),
-                                                        _("If TRUE, scroll arrows are added if there are to many tabs to fit"),
+                                                        _("If TRUE, scroll arrows are added if there are too many tabs to fit"),
                                                         FALSE,
                                                         G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,

diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c
index 74b5485a4c4528358ec9ce1e881f4153f9e821c6..ed85eab5889b4b6e54f8ef5a6ca8206890c01590 100644 (file)
--- a/gtk/gtkprogress.c
+++ b/gtk/gtkprogress.c
@@ -120,7 +120,7 @@ gtk_progress_class_init (GtkProgressClass *class)
                                    PROP_ACTIVITY_MODE,
                                    g_param_spec_boolean ("activity_mode",
                                                         _("Activity mode"),
-                                                        _("If true the GtkProgress is in activity mode, meaning that is signals something is happening, but not how much of the activity is finished. This is used when you're doing something that you don't know how long it will take."),
+                                                        _("If TRUE the GtkProgress is in activity mode, meaning that it signals something is happening, but not how much of the activity is finished. This is used when you're doing something that you don't know how long it will take."),
                                                         FALSE,
                                                         G_PARAM_READWRITE));
 
@@ -136,7 +136,7 @@ gtk_progress_class_init (GtkProgressClass *class)
                                   PROP_TEXT_XALIGN,
                                   g_param_spec_float ("text_xalign",
                                                       _("Text x alignment"),
-                                                      _("A number between 0.0 and 1.0 specifying the horizontal alignment of the text in the progresswidget"),
+                                                      _("A number between 0.0 and 1.0 specifying the horizontal alignment of the text in the progress widget"),
                                                       0.0,
                                                       1.0,
                                                       0.5,

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index d6c16147fdbab83f3e4a729e20cecb10362299f6..98c07b0a43aa4efeec8fa0784dedc4d28b48845e 100644 (file)
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -137,7 +137,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                    PROP_ORIENTATION,
                                    g_param_spec_enum ("orientation",
                                                      _("Orientation"),
-                                                     _("Orientation and growth of the progress bar"),
+                                                     _("Orientation and growth direction of the progress bar"),
                                                      GTK_TYPE_PROGRESS_BAR_ORIENTATION,
                                                      GTK_PROGRESS_LEFT_TO_RIGHT,
                                                      G_PARAM_READWRITE));

diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index b6baa4b26866d0ca538e655f26bfad5d36eda903..8c530c8a58e128a8c69c1b34a28b8b5d6e4584b1 100644 (file)
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -197,7 +197,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_NAME,
                                    g_param_spec_string ("name",
                                                         _("Tag name"),
-                                                        _("Name used to refer to the text tag"),
+                                                        _("Name used to refer to the text tag. NULL for anonymous tags."),
                                                         NULL,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 
@@ -215,7 +215,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_BACKGROUND_GDK,
                                    g_param_spec_boxed ("background_gdk",
                                                        _("Background color"),
-                                                       _("Background color as a GdkColor"),
+                                                       _("Background color as a (possibly unallocated) GdkColor"),
                                                        GDK_TYPE_COLOR,
                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
 
@@ -249,7 +249,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_FOREGROUND_GDK,
                                    g_param_spec_boxed ("foreground_gdk",
                                                        _("Foreground color"),
-                                                       _("Foreground color as a GdkColor"),
+                                                       _("Foreground color as a (possibly unallocated) GdkColor"),
                                                        GDK_TYPE_COLOR,
                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
 
@@ -283,7 +283,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_FONT,
                                    g_param_spec_string ("font",
                                                         _("Font"),
-                                                        _("Font description as a string"),
+                                                        _("Font description as a string, e.g. \"Sans Italic 12\""),
                                                         NULL,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
 
@@ -308,7 +308,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_STYLE,
                                    g_param_spec_enum ("style",
                                                       _("Font style"),
-                                                      _("Font style"),
+                                                      _("Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC."),
                                                       PANGO_TYPE_STYLE,
                                                       PANGO_STYLE_NORMAL,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
@@ -317,7 +317,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_VARIANT,
                                    g_param_spec_enum ("variant",
                                                      _("Font variant"),
-                                                     _("Font variant"),
+                                                     _("Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS."),
                                                       PANGO_TYPE_VARIANT,
                                                       PANGO_VARIANT_NORMAL,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
@@ -326,7 +326,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_WEIGHT,
                                    g_param_spec_int ("weight",
                                                      _("Font weight"),
-                                                     _("Font weight"),
+                                                     _("Font weight as an integer, see predefined values in PangoWeight; for example, PANGO_WEIGHT_BOLD."),
                                                      0,
                                                      G_MAXINT,
                                                      PANGO_WEIGHT_NORMAL,
@@ -337,7 +337,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_STRETCH,
                                    g_param_spec_enum ("stretch",
                                                       _("Font stretch"),
-                                                      _("Font stretch"),
+                                                      _("Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED."),
                                                       PANGO_TYPE_STRETCH,
                                                       PANGO_STRETCH_NORMAL,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
@@ -346,7 +346,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_SIZE,
                                    g_param_spec_int ("size",
                                                      _("Font size"),
-                                                     _("Font size"),
+                                                     _("Font size in Pango units."),
                                                      0,
                                                      G_MAXINT,
                                                      0,
@@ -356,7 +356,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_SCALE,
                                    g_param_spec_double ("scale",
                                                         _("Font scale"),
-                                                        _("Font scale"),
+                                                        _("Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE."),
                                                         0.0,
                                                         G_MAXDOUBLE,
                                                         1.0,
@@ -385,7 +385,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_LANGUAGE,
                                    g_param_spec_string ("language",
                                                         _("Language"),
-                                                        _("Language engine code to use for rendering the text"),
+                                                        _("The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If you don't understand this parameter, you probably don't need it."),
                                                         NULL,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));  
 
@@ -425,7 +425,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_RISE,
                                    g_param_spec_int ("rise",
                                                      _("Rise"),
-                                                     _("Offset of text above the baseline (below the baseline if rise is negative)"),
+                                                     _("Offset of text above the baseline (below the baseline if rise is negative) in pixels"),
                                                     G_MININT,
                                                      G_MAXINT,
                                                      0,
@@ -500,7 +500,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                    PROP_INVISIBLE,
                                    g_param_spec_boolean ("invisible",
                                                          _("Invisible"),
-                                                         _("Whether this text is hidden"),
+                                                         _("Whether this text is hidden. Not implemented in GTK 2.0"),
                                                          FALSE,
                                                          G_PARAM_READABLE | G_PARAM_WRITABLE));